From d6cc31ba529e48ac7c7ac8e34531ff64530f1af8 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 1 Jul 2005 12:30:19 +0000 Subject: [PATCH] mkelf32 explicit-size types are based on defs in inttypes.h. Signed-off-by: Keir Fraser --- xen/arch/x86/boot/mkelf32.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c index 4b7515c8cc..8fb665e068 100644 --- a/xen/arch/x86/boot/mkelf32.c +++ b/xen/arch/x86/boot/mkelf32.c @@ -15,33 +15,16 @@ #include #include #include - -/* - * Here I'm taking care not to conflict with possible typedef's in - * standard headers by instead using the macro namespace. - */ -#undef u8 -#undef u16 -#undef u32 -#undef u64 -#undef s8 -#undef s16 -#undef s32 -#undef s64 -#define u8 unsigned char -#define u16 unsigned short -#define u32 unsigned int -#define s8 signed char -#define s16 signed short -#define s32 signed int -#if defined(__i386__) -#define u64 unsigned long long -#define s64 signed long long -#else -#define u64 unsigned long -#define s64 signed long -#endif - +#include + +#define u8 uint8_t +#define u16 uint16_t +#define u32 uint32_t +#define u64 uint64_t +#define s8 int8_t +#define s16 int16_t +#define s32 int32_t +#define s64 int64_t #include "../../../include/xen/elf.h" #define DYNAMICALLY_FILLED 0 -- 2.30.2